| commit | 27a128bdf7d0ab4b37022233ba5ae84a8ebd605f | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Thu Aug 13 01:23:00 2009 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Thu Aug 13 01:23:00 2009 |
| tree | 899c40ef171884bcc7c8db4a798e44c506bed715 | |
| parent | 9f88386765adc1aacb4a0e3b488c69cffc59ca70 [diff] [blame] |
Autogenerated HTML docs for v1.6.4-122-g6ffd7
diff --git a/gitattributes.txt b/gitattributes.txt index aaa073e..1195e83 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -404,7 +404,7 @@ The attribute `merge` affects how three versions of a file is merged when a file-level merge is necessary during `git merge`, -and other programs such as `git revert` and `git cherry-pick`. +and other commands such as `git revert` and `git cherry-pick`. Set::